<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>merge_file</title>
<meta name='robots' content='noindex,nofollow' />
<meta name='generator' content='GLOBAL-6.5.7' />
<meta http-equiv='Content-Style-Type' content='text/css' />
<link rel='stylesheet' type='text/css' href='../style.css' />
</head>
<body>
<pre>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2043'>merge_file</a>       2043 src/diffviewer/ydiff.c dview_remove_hunk (WDiff * dview, FILE * merge_file, int from1, int to1,</span>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2059'>merge_file</a>       2059 src/diffviewer/ydiff.c         fputs (buf, merge_file);</span>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2065'>merge_file</a>       2065 src/diffviewer/ydiff.c             fputs (buf, merge_file);</span>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2083'>merge_file</a>       2083 src/diffviewer/ydiff.c dview_add_hunk (WDiff * dview, FILE * merge_file, int from1, int from2, int to2,</span>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2106'>merge_file</a>       2106 src/diffviewer/ydiff.c         fputs (buf, merge_file);</span>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2113'>merge_file</a>       2113 src/diffviewer/ydiff.c             fputs (buf, merge_file);</span>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2116'>merge_file</a>       2116 src/diffviewer/ydiff.c         fputs (buf, merge_file);</span>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2136'>merge_file</a>       2136 src/diffviewer/ydiff.c dview_replace_hunk (WDiff * dview, FILE * merge_file, int from1, int to1, int from2, int to2,</span>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2158'>merge_file</a>       2158 src/diffviewer/ydiff.c         fputs (buf, merge_file);</span>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2164'>merge_file</a>       2164 src/diffviewer/ydiff.c             fputs (buf, merge_file);</span>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2170'>merge_file</a>       2170 src/diffviewer/ydiff.c             fputs (buf, merge_file);</span>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2199'>merge_file</a>       2199 src/diffviewer/ydiff.c         FILE *merge_file;</span>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2222'>merge_file</a>       2222 src/diffviewer/ydiff.c         merge_file = fdopen (merge_file_fd, "w");</span>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2228'>merge_file</a>       2228 src/diffviewer/ydiff.c                 dview_add_hunk (dview, merge_file, from1, from2, to2, FROM_RIGHT_TO_LEFT);</span>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2230'>merge_file</a>       2230 src/diffviewer/ydiff.c                 dview_remove_hunk (dview, merge_file, from1, to1, FROM_LEFT_TO_RIGHT);</span>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2234'>merge_file</a>       2234 src/diffviewer/ydiff.c                 dview_remove_hunk (dview, merge_file, from1, to1, FROM_RIGHT_TO_LEFT);</span>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2236'>merge_file</a>       2236 src/diffviewer/ydiff.c                 dview_add_hunk (dview, merge_file, from1, from2, to2, FROM_LEFT_TO_RIGHT);</span>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2239'>merge_file</a>       2239 src/diffviewer/ydiff.c             dview_replace_hunk (dview, merge_file, from1, to1, from2, to2, merge_direction);</span>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2244'>merge_file</a>       2244 src/diffviewer/ydiff.c         fflush (merge_file);</span>
<span class='curline'><a href='../S/src--diffviewer--ydiff.c.html#L2245'>merge_file</a>       2245 src/diffviewer/ydiff.c         fclose (merge_file);</span>
</pre>
</body>
</html>
